# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.676.14.10 -> 1.676.14.11 # drivers/acpi/ospm/system/sm_osl.c 1.6 -> 1.6.1.1 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/09/27 bjorn_helgaas@hp.com 1.676.14.11 # Revert ACPI comment change so acpi-20020517-2.4.18.diff applies cleanly. # -------------------------------------------- # diff -Nru a/drivers/acpi/ospm/system/sm_osl.c b/drivers/acpi/ospm/system/sm_osl.c --- a/drivers/acpi/ospm/system/sm_osl.c Wed Oct 8 09:07:12 2003 +++ b/drivers/acpi/ospm/system/sm_osl.c Wed Oct 8 09:07:12 2003 @@ -685,9 +685,6 @@ */ if (state == ACPI_S2 || state == ACPI_S3) { #ifdef DONT_USE_UNTIL_LOWLEVEL_CODE_EXISTS - /* That && trick is *not going to work*. Read gcc - specs. That explicitely says: jumping from other - function is *not allowed*. */ wakeup_address = acpi_save_state_mem((unsigned long)&&acpi_sleep_done); if (!wakeup_address) goto acpi_sleep_done;